From 2a9d299aa3419396d4c5bdcb61b746fd7b652183 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Sun, 3 Oct 2010 03:41:44 +0200
Subject: [PATCH] docs: Use gtk_widget_get_preferred_size() instead
 gtk_size_request_get_preferred_size()

GtkSizeRequest interface is now merged in GtkWidget
---
 docs/reference/gtk/tmpl/gtkcontainer.sgml         | 2 +-
 docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml | 2 +-
 gtk/gtk.symbols                                   | 1 -
 gtk/gtkwidget.c                                   | 2 +-
 gtk/gtkwindow.c                                   | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/docs/reference/gtk/tmpl/gtkcontainer.sgml b/docs/reference/gtk/tmpl/gtkcontainer.sgml
index 3d0f2fb9e3..69c5f6fca0 100644
--- a/docs/reference/gtk/tmpl/gtkcontainer.sgml
+++ b/docs/reference/gtk/tmpl/gtkcontainer.sgml
@@ -58,7 +58,7 @@ of their children.
 <para>
 The size requisition phase of the widget layout process operates top-down.
 It starts at a top-level widget, typically a #GtkWindow. The top-level widget
-asks its child for its size requisition by calling gtk_size_request_get_preferred_size().
+asks its child for its size requisition by calling gtk_widget_get_preferred_size().
 To determine its requisition, the child asks its own children for their
 requisitions and so on. Finally, the top-level widget will get a requisition
 back from its child.
diff --git a/docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml b/docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml
index f50edf41a4..844a1bbfdc 100644
--- a/docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml
@@ -37,7 +37,7 @@ The #GtkFileChooserButton supports the #GtkFileChooserAction<!--
 <para>
 The #GtkFileChooserButton will ellipsize the label,
 and thus will thus request little horizontal space.  To give the button
-more space, you should call gtk_size_request_get_preferred_size(),
+more space, you should call gtk_widget_get_preferred_size(),
 gtk_file_chooser_button_set_width_chars(), or pack the button in
 such a way that other interface elements give space to the widget.
 </para>
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index c2963d096f..c24c073ebe 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -370,7 +370,6 @@ gtk_scroll_type_get_type G_GNUC_CONST
 gtk_selection_mode_get_type G_GNUC_CONST
 gtk_shadow_type_get_type G_GNUC_CONST
 gtk_size_group_mode_get_type G_GNUC_CONST
-gtk_size_request_mode_get_type G_GNUC_CONST
 gtk_sort_type_get_type G_GNUC_CONST
 gtk_spin_type_get_type G_GNUC_CONST
 gtk_state_type_get_type G_GNUC_CONST
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index e97c62417a..bd404f6db1 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -8653,7 +8653,7 @@ gtk_widget_set_size_request (GtkWidget *widget,
  * @height indicates that that dimension has not been set explicitly
  * and the natural requisition of the widget will be used intead. See
  * gtk_widget_set_size_request(). To get the size a widget will
- * actually request, call gtk_size_request_get_preferred_size() instead of
+ * actually request, call gtk_widget_get_preferred_size() instead of
  * this function.
  **/
 void
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index c2c787b1bc..54b82546c8 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -6503,7 +6503,7 @@ gtk_window_constrain_size (GtkWindow   *window,
 
 /* Compute the set of geometry hints and flags for a window
  * based on the application set geometry, and requisition
- * of the window. gtk_size_request_get_preferred_size() must have been
+ * of the window. gtk_widget_get_preferred_size() must have been
  * called first.
  */
 static void
-- 
2.30.2